[TrimmableTypeMap] Package ReadyToRun trimmable typemap assemblies#11473
Merged
jonathanpeppers merged 2 commits intoMay 27, 2026
Merged
Conversation
Add generated trimmable typemap assemblies to ResolvedFileToPublish so the .NET SDK ReadyToRun pipeline sees them, then replace linked typemap assemblies with the R2R outputs before Android packaging. Extend the CoreCLR trimmable typemap packaging test to assert the packaged entry assembly is ReadyToRun and that typemap payloads are unique. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival
added
copilot
simonrozsival
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the CoreCLR trimmable TypeMap packaging flow so the generated TypeMap assemblies are routed through the standard publish pipeline, allowing crossgen2/ReadyToRun to process them, and adds a test to verify the packaged TypeMap entry assembly is R2R and not duplicated.
Changes:
- Add trimmable TypeMap assemblies to
ResolvedFileToPublishwithPostprocessAssembly=truesoCreateReadyToRunImagesprocesses them. - After R2R, swap publish items to use the R2R outputs rather than the linked IL inputs.
- Extend the CoreCLR trimmable typemap packaging test to assert R2R headers and ensure TypeMap payloads are packaged only once.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.TypeMap.Trimmable.CoreCLR.targets | Routes typemap assemblies through ResolvedFileToPublish for R2R and replaces linked inputs with R2R outputs. |
| src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/TrimmableTypeMapBuildTests.cs | Adds an end-to-end packaging test validating the TypeMap entry assembly is R2R and not duplicated. |
Comment on lines
+48
to
+60
| <Target Name="_UseReadyToRunTrimmableTypeMapAssembliesForPublish" | ||
| Condition=" '$(RuntimeIdentifier)' != '' and '$(PublishReadyToRun)' == 'true' " | ||
| AfterTargets="CreateReadyToRunImages"> | ||
| <ItemGroup> | ||
| <_LinkedTypeMapDlls Remove="@(_LinkedTypeMapDlls)" /> | ||
| <_TypeMapDlls Remove="@(_TypeMapDlls)" /> | ||
| <_TrimmableTypeMapAbi Remove="@(_TrimmableTypeMapAbi)" /> | ||
| <_TrimmableTypeMapLinkedAssemblies Include="$(IntermediateOutputPath)linked\_*.TypeMap.dll;$(IntermediateOutputPath)linked\_Microsoft.Android.TypeMap*.dll" /> | ||
| <_TrimmableTypeMapReadyToRunAssemblies Include="$(IntermediateOutputPath)R2R\_*.TypeMap.dll;$(IntermediateOutputPath)R2R\_Microsoft.Android.TypeMap*.dll" /> | ||
| <ResolvedFileToPublish Remove="@(_TrimmableTypeMapLinkedAssemblies)" /> | ||
| <ResolvedFileToPublish Remove="@(_TrimmableTypeMapReadyToRunAssemblies)" /> | ||
| <ResolvedFileToPublish Include="@(_TrimmableTypeMapReadyToRunAssemblies)"> | ||
| <RelativePath>%(Filename)%(Extension)</RelativePath> | ||
| <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory> | ||
| <RuntimeIdentifier>$(RuntimeIdentifier)</RuntimeIdentifier> | ||
| </ResolvedFileToPublish> |
Member
Author
|
/review |
|
✅ Android PR Reviewer completed successfully! |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
✅ LGTM — Clean simplification
Summary: This PR replaces the manual per-ABI assembly store injection (_AddTrimmableTypeMapAssembliesToStore) with a much simpler approach: flowing TypeMap assemblies through the standard ResolvedFileToPublish pipeline so the SDK's existing R2R target processes them. The post-R2R target then swaps linked IL copies for R2R images. The new test thoroughly verifies both the intermediate R2R output and the final APK contents.
Positives:
- Significant complexity reduction (~56 lines removed, ~29 added) — the old ABI-batching logic was error-prone
- Good use of the existing SDK pipeline (
PostprocessAssembly=true) rather than reimplementing R2R integration - Test is well-structured: verifies PE headers for R2R, checks for duplicates in the APK, and confirms the packaged assembly is actually the R2R image
Minor suggestions (2):
- Duplicated glob patterns across the two targets could drift — consider a shared property
- Nullable flow in test could be cleaner
CI is green across all checks.
Generated by Android PR Reviewer for issue #11473 · ● 7.7M
This was referenced May 26, 2026
Emit all compressed assembly native symbols even when assembly compression is disabled so the CoreCLR app host can link and load libmonodroid successfully. Add regression coverage to the CoreCLR ReadyToRun build test, which already builds with AndroidEnableAssemblyCompression=false. ### Strengthen compressed assemblies test Assert the exact empty compressed assemblies LLVM IR definitions when assembly compression is disabled for CoreCLR ReadyToRun publishes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This comment was marked as low quality.
This comment was marked as low quality.
simonrozsival
added
the
ready-to-review
jonathanpeppers
approved these changes
May 27, 2026
jonathanpeppers
deleted the
dev/simonrozsival/trimmable-typemap-r2r-packaging
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Validation
Notes
References #10792